Merge tag '10.48_rc1'

Upstream version 10.48~rc1

Had to handle a conflict in pcre2-config.in

diff --cc pcre2-config.in
index 4534ea0a32936c2c44cc0226da875480b2c93b68,f85e12f82b3f2ef1d30b8d56539532af70d7b27e..ab8ee14b62ed8eaf81839cec3b99b2f6a3cb5a0b
--- 1/pcre2-config.in
--- 2/pcre2-config.in
+++ b/pcre2-config.in
@@@ -28,8 -28,29 +28,21 @@@ if test $# -eq 0; the
  fi
  
  libR=
 -case `uname -s` in
 -  *SunOS*)
 -  libR=" -R@libdir@"
 -  ;;
 -  *BSD*)
 -  libR=" -Wl,-R@libdir@"
 -  ;;
 -esac
  
  libS=
+ case "@libdir@" in
+   # system locations on Linux, no -L needed
+   /usr/lib|/usr/lib32|/usr/lib64|/usr/lib/*-gnu*)
+   ;;
+   /lib|/lib32|/lib64|/lib/*-gnu*)
+   ;;
+   # system locations on AIX and Solaris, no -L needed
+   /usr/lib/64|/usr/lib/amd*|/usr/lib/sparc*|/usr/lib/ppc*)
+   ;;
+   *)
+   libS="-L@libdir@"
+   ;;
+ esac
  
  while test $# -gt 0; do
    case "$1" in